Merge branch 'shell-escape' of https://github.com/bluss/cargo into shell

diff --cc src/cargo/util/mod.rs
index 095884d776d4bcbeff1d25e48d540f8916479e7f,685e5fe472e2e62f7850369785e5e6bd8ef73a72..ed4d079f972146665e7a24bf9182631a62eb0955
--- 1/src/cargo/util/mod.rs
--- 2/src/cargo/util/mod.rs
+++ b/src/cargo/util/mod.rs
@@@ -30,4 -31,6 +30,5 @@@ pub mod toml
  pub mod lev_distance;
  mod dependency_queue;
  mod sha256;
+ mod shell_escape;
  mod vcs;
 -mod mtime;